Removed a bunch of testing code