Removed hardcoded return; as we now have global default settings