Clean up Parser class section;