Removed MCP stuff