Remove unneeded maps