Clean TODOs and commented code which works.