cleaned up some TODO