more cleaning
remove used url form builder
code clean up