Clean TODOs. To Be Continued [Stable]