Updated clean script to support more options