Clean up Square