Removed a lot of redundant self prefixes