More cleanup in preperation of pseudo log scale