[LOG-65] cleaning up some TODO items from around the homestead