Fixing small things.
Removing unused stuff.