Removed more dead code
Oops, that wasn't supposed to go