Cleanup class declarations