remove junk
fix fufunctionality