Delete dead code + updating the grammar