Removed all barrel code pending re-write