Tons of cleanup. Still missing automated tasks