cleaned views / removed old code