Cleanup of a few classes