Remove old API stuffs