removed unnnesessary code