remove some crap
merge conflicts mkay