removed conditional logic from main js