Removes need for tsm macros

Tidys up tape, drive and a few other stats, still work in progress