Further cleaning, starting to pull resources