Fix return value check
Run clean.sh before rolling back