cleanup & merging