Clean up
Updated header references to version 7u21