Add two utils.
Remove used files.
Add test cases.