initial revision
remove unused url
syntax cleanup