Drop service checks events if not explicitly enabled

@remh sounds reasonable?