remove OOMHandler
build fixes (API changes)