Forgot to clean up some of the Square code