Removed shortcuts - so logging is always done