Remove extra riaknostic target calls