Removed a bunch of if(0) and dead code