Removed some displays and commented-out code