Remove custom Square stuff