cleanup and documentation
MA: deleted cruft