#403 - Removed Grammar and updated tets
#403 - Removed un used class