Cleanupafs

Merged Ben Morrice requested to merge cleanupafs into master

Merge request reports