removed macro "edition-if-available" 

and other changes after review