smba1002: removed some code that is already being done in common tree