Merge cleanup, removed code related to sandbox branch.