Unused code cleaned