Remove unnecessary and confusing organisation code