Cleaned up some of the Object removal code