Cleanup of things left from Dan's original version