smba1002: few minor removals from code