removed done TODO's from the code