Removed TODO's since new issues created for them