removed url module and misc. cleanup