package cleanup & Deleted SecondEdition enum