Motion effects cleanup, closes #41