0.11 Cleanup