Remove unnecessary calls and initializations