Removing a bit of crap code