Cleaning up the shelter mess