Removed all traces of PIN support