Remove TODO's