Added a TODO to remove the developer-only code. Left the code inside for
now.