Remove debug issues