Removing TODO comment for completed functionality.