* Remove redundant code