More cleanup from the semantic merging

more cleanup, only affects two files