get rid of TODO also