Now removed completely the swps