get rid of a lot of junk and put back the functionality this thing used to have