removed unnesecary code