Getting rid of some code in Prod that was only needed for tests