Removing auxillary functions in parser