Further merging/cleanup