File cleanup from merge