removing unecessary dependencies on map/attributes