Remove unused code
Merge pull request #271 from flightjs/remove-unused-code

Remove unused code