Bit more code cleanup, including now the production files