removed nested url's for now.
some code cleanup