Removed explicit dependencies from core