Cleaned up some of the shape board code.