Removed a lot of unused stuff.