Tweaked Clean Script again