Drop and exec and clean up a bit