smba1002: more removal of un-needed stuff