Removed some todo in the code.