cleaning up before merge