M: remove obsolete warnings, some cleanup