Remove some old fun cruft