removing unnecessary piece of code^H^H^Hrap