Remove useless code + remove testing code