more PHSEN cleanup
Merge branch 'sami' into phsen
more cleanup