Remove dependencies and added interfaces