Removed more code redundance

Movements around some edges are too jerky, this must be fixed.