cleaning up from merge