Cleaning, removing TODO's already done.