comment added, unused code removed