cleaning up after some merging;