remove button no longer resets after 1.5s, part of #17