Fixed remove button and added some logging.