Removed more <iostream> includes