fix warning and make cleanup