Eliminated irrelevant code