modified TODOs and removed unneccessary log