removed unnecessery classes