remove tuna stuff for now..