Could you remove this?
Other code looks Okay so I can merge PR.