FIX: No debug junk