Various cleanup and removing debug prints