fix imports, determine when to stop importing prod