Closes #148, Closes #143 - remove obsolete view