Improved performance on the parsing

Removed full syntactic analysis of annotated text, improves performance
of parsing