Remove dependency on submit button