Remove some fishy things