Apply more review and remove unused line