Removed all TODO's and cleanup