Removed unused stuff

Hey @nwinter! Go ahead and merge if it's fine.