Small cleanup for demo with CoM