remove obsolete files from branch
sync 21 branch with libraries