Cleanup code from previous merge