Fixed unused open API and added more comments