whitespace sorry
remove unused stuff
merge
more merge