Minor refactoring: some String literals moved to Constants or entity classes, some unused DAO and service methods removed