Console log removal and some clean up