Remove unneded code