Warnings removal and other cleanup.