removed extraneous comments about the #ifndef stuff