rm duplicate code from fb tornado