Remove junk, multiply defined functions