adds 'same passcode' error msg, cleans up unused error code