Removing trace of old gambiarra