remove duplicated code due to cutnpaste error?
cleaning