I'd prefer not Commit Device.java if it is not used at all. You could keep local change for unit test for future.