Clean up unneeded data objects

also put name cleaning in more appropriate spot