cleanup and almost fix indirect zones