Removed un-needed imports.
Some cleanup of code formatting.