Removed some dead code. Attempted velocity bugfix