More perms derp fixes + entity remover