Refactor and remove old views