Cleaned up verification code and fixed some bugs caused by merge with develop
Cleaned up verification code and fixed some bugs caused by merge with develop

zamattiac/ROSIEBot,zamattiac/ROSIEBot,zamattiac/ROSIEBot,zamattiac/ROSIEBot