Remove code that didn't do its job properly