Remove unused imports and unused variables. Fix spacing.
Merged in nsoranzo/galaxy-central (pull request #312)

Remove unused imports and unused variables. Fix spacing.