Removed dependencies that produced circular imports