cleanup, ui-router downgrade and fixes