Bug fixes to RIB grammar and removed unused constructs