removed unused code and missed strings