bunch of random cleanup

1 job for NPE_Mood in 7 minutes and 29 seconds (queued for 5 seconds)