Clean up code from old crash