remove unused imports + rename some strings