Simplify removal of logged-in/logged-out elements