got rid of some cruft
Merge branch 'merge_feature' into develop