expand out statistics macros
make copy and paste easier
remove unused .py file
bump rmf