remove data collection from output
remove unecessary logic form emails