fixed remove user and selections for calculations