Clean up Object class