Remove dependency on Hardware.java