Remove unnecessary target info and add url reference