Removed extraneous old POJOs and what not