Add cleanup after parsing