Removing more useless files, cleaning up