cleanup

cleanup after messing up a merge