push to API 9 and cleanup plus hook fix