Remove the pressure system and clean up more code