Cleaned up imports vs depends problems