CSP1150 A1: removed more this