Feature/remove java util date