Renaming and removed debug