taking out unused items for MVP