cleanup

still cleaning up mistakes from screwed up merge