Clean-up of filings code.