Removed Web API dependencies from core