Fix packaging
Correct cleanup
Remove pointless 'final'
Convert utility class to normal class