Remove un-used code.  Organize imports.