Hide warning time expire message, update code