Merge pull request #583 from kimtree/clean-up-code
authorJoshua Roesslein <jroesslein@gmail.com>
Thu, 5 Nov 2015 04:55:45 +0000 (20:55 -0800)
committerJoshua Roesslein <jroesslein@gmail.com>
Thu, 5 Nov 2015 04:55:45 +0000 (20:55 -0800)
Remove deprecated function and clean up codes


Trivial merge