Removed unused class. Refined movement a bit more