change/remove a lot of stuff

starting clean