Remove dependencies between classes