Removing duplicate messaging and commenting out broken-ish code