Added some cleanup features in peuplator