Remove previous maps flickering patch. Remove log. Add leak patch from master.