Remove unused code, or incomplete