clean up, test merging topk & dev