Added Dead Code removal