removed unused references
refactored uri creation