Remove opsolete modules
Update to latest master