Remove debugging comments
Remove weird firstKick method
Cleanup removeMomentum