remove double barring
merged with jon's