Removed commented out code - shame on me