lots of cleanups. using now autowired repositories for paging etc.