remove unused method & renaming