Cleaned code of clamav module