#40 Upgrade Spring Data/Rest to the newest version: Cleanup during redesign