Removing unused stuff.
Removing more unused stuff.
Changes, removing stuff, moving things around.