remove deprecated code
fix submarine killability
minor fixes and remove comments