Removing more legacy files