cleanup, generic warnings fixes
revert target