master - NEW: removing everything except defaults for now