Cleanup, added vendors, production, etc