FW: Cleaned up IR Blaster stuff

Change-Id: I7e3600a7c2175386ef4a6a2d54d04f6173b62ddb