removed unnec. code