removed subpathauto and options_element since they are included in sites/all now