Update grammar, remove unused staments