All TODO's implemented or deleted when not relevant anymore