removed old nephos specific workarounds