Remove unnecessary debug log
Use Long class instead of long
Use Long class instead of long - more fixes