Removed useless code since update