Some cleanup in TODO
Deleted private stuff