Refs #10537 REvert changes on develop
Refs #10537 Fix problems found by buildserver
Refs #10537 Removed unused variables