[GP,LA]{refactoring} Removing unneeded logging, some other small changes