Remove user redundancy and bugfix annotateImages()