Clean up some old code, do a bit of hacking to reduce the number of y labels