removed left over commented out code