Removed legacy motion stream code

Renamed motion2 to motion to keep things tidy