Removed conflicted parts of the grammar until it is refactored.