Removed dead (and invalid) code