cleaned up warnings, organized imports, removed unnecessary file.

cleaned up warnings, organized imports, removed unnecessary file.