removing all the extras