remove unessacary code