Removed some warnings about unused variables