finally clean up warning code