Upgrade to 4.0.10.Final
Cleanup dependencies