Fixed deadline issues.
Remove the button var