amp_entropy improved
cleanup