Remove final_cleanup option

Let the client code handle this (hideous) hack.