Removed all TODO's