clean up demolish code