Remove most of old API