Cleanup and removal of old class.