Clean up

Cleaned up changed classes