Cleaned debug code