Partial removed unused code