Removing unnecessary userland references