Begin removing useless code