Factorial cleanup