Remove feature_list stuff on second thought