Clean up unused vars and methods
Unbound movement