Fix goal special cells not cleaning up
Bug fixes