Removed all the TODO-s, as noted by @MelvinK.