Cleanup.
Added new check for Filger.