cleanup, Wall+Werror