removed obsolete user preference
added more helpers for recurrent expectations