More post-funkybob cleanup