Remove complications that no longer server any required purpose.
merge trunk