movementstyle cleanup