removed unnesessary code