Deleted deprecated methods in parser and minor changes