Removed fininshed TODO's