Removing comment and fixing remote uri -> url