Removed a bunch of unused stuff