removed extraneous comments and unused code