Revert "Connor TODO Things"

This reverts commit fdbb111e4010bf6e67ba18b208c8124281e31d61.