Tidying - HypeM needs cassettes and many things seem broken.