refactor out lirc changes
refactor out lirc changes