cleaned up some junk