Spring db updates and project cleanup