Min SDK 9
Cleanup