Debug and clean