Comment out goal detection throwouts until they are fixed