remove attributes not supported by ENML

remove attributes not supported by ENML
Merge branch 'dev'