Removed DEBUG vars and dead code