remove unnesccessary code