Remove deprecated codes round one