Removed redudant views and controller. TRAD-20