Roku: Further cleanup