Removed a bunch of code