cleaning up code after movement introduction