Cleaned up some old hacks from auto_fu