removed cookie stuff
merged