soem cleanups