Updated stripping regexp