code commit and clean up some of legacy code left over