Remove stray comments and old file