Remove un-needed statements