sounds like you are well on your way. i think your cleanup crew will be efficient.