Fix maven build errors
Delete unused Comparator