removing unused views
adding in support for named queries