remove workarounds, ws