Organize some imports.  Remove un-used classes.  Remove un-used code.