Removed maintence of dictionaries (commented them out)