Some more cleanup

giannozz requested to merge giannozz/q-e:master into develop Jan 24, 2019