Bypass SMES

Last commit did not work, so not the SMES are bypassed but not removed.