more cleanups

1 job for nifty2go in 4 minutes and 50 seconds (queued for 1 second)