Cleaned up conditionals, updated external_nomtime to work wiht new scheduler