Deleted lots of old stuff and some reface