Clean up object.h