Cleaned up solution for unused methods, etc.