Reworked the death function, removed un-needed code and classes