Removed some TODO's that were completed-