Merge "remove unused feature and scripts"