Remove obsolete api stuff