Cleanup (and restore helpers.php)