Fixed and removed some of the APIs