Remove bits of code/includes/etc that aren't necessary.
Removed unused variables.