Silenced some warnings
Remove an unused method
Use separate inputs for swimming and flying
Avoid swimming into the air from underwater
Non-colliding objects are considered flying