Removing unused file, and some unused variables and imports...