Cleaning up interfaces to rezone all