Removed the modal as well