Got rid of useless code