removed users view and some commented out code