Dealt with unused code