Remove unnessary code