Cleaning up final rotting remains of the old API code