Melanie/DC | #2915 | removing unused views