Fix merge errror. Remove no hardware message.