initial commit pre cleanup