further cleanup of the mess due to merge..