Cleaned up Merged code.