Killed off some unnecessary code