clean up crappy merge from brians #YOLO prod edits