Remove system dependencies

Remove hardcode file paths and address formats