Repo cleanup and few updated editions

Minor cleanup before major update.