Remove some code from tuna