Removed unused code from parser