Cleanup; going to throw in InsertInner soon