moce cleanupProvider classes to api