Removed dead lines, fixed comments