Removed debug class from verious files