Some more perf improvements, removed unrequired calls.