Further code cleaned up. No new features to report.