cleanup and move of consts from engine to service.