Revert "soem cleanup"

This reverts commit d68be68cbe946f8ccdd345ae6e2febd6e37f3a25.