misc cleanup and remove unneeded maps