Remove dead code
Merge pull request #2483 from bootstraponline/clean_up

Clean up