Added warning message and removed a TODO comment