Removed c++11 for each style loops I missed