removed unnecessary view, code clean up