Drop custom SRC & DEST
Improve smu support