-More code cleanup from merging weirdness