WIP: removing useless code