WIP
Melanie/DC | #2915 | Removing unused views