James D. Callahan III:
	- Cleanups
	- Removed commented-out code.
