Cleanup in parser