Presence controll methods changed, small clean-up