Got rid of some useless code.