clean up stuff from movement changes, remove test entity-target code
(not quite working)