Cleaned some code, preparing for 4.1.0 official (Mostly waiting for 1.7
MCP).