Remove obsolete code
Reorder method declarations for readability