more libcore removal