Remove useless objects. Clean up implementation.