Remove unnecessary state variable adr_ prefixes