Remove unnecessary piece of code