File cleaned up from merge