By Dano Manion: Remove some cruft