Cleaned up prior to restructuring.