Dc/Melanie | #2915 |Deleted unused views