Take out redundant scope, fix relevant one