Comments, removed unused code