Removed a bunch of dead code that's been made redundant