Cleanup the core classes
15 files changed