Remove finn specific stuff.