Moved to new file, killing a lot of warnings