One more file cleaned up, then rebasing