cleaning up code, removing unused methods