Started removing useless code