#213 Added support for remove PIN use case