Added missing interfaces and removed debug files