Finaly TODO is cleaned up.