remove no longer needed stuff, some new stuff <3 all the things