Revert "Cleaned up more repetition with new functions get-vx and get-vy}"

This reverts commit fb94c0ff51e3ea9ee5b9884d1bd5d3492f26a4c1.