Removed some leftover variables
Scope in C++ is kinda weird