remove unused functions
rm more dead code