remove unused methods and code