unused logger deleted
Util changed to generic + unchecked warning added

some more code cleanup in the rest of the project