*Remove unused code
*Remove hack
*Add FIXME