Moving empty to the center of mass and some other cleanup.