Changed remove listeners to only remove listeners to content within modal