Remove unused code + useless Accept