second pass of cleanup for omf aspects