Clean up some useless files and imports