Removed excess imports, modified regex in compliance with fb modifications, annotation corrections