Updating clean script as per TODO