Remove extra require and minor cleanup
Merge pull request #1307 from kumabotz/minor-cleanup

Remove extra require and minor cleanup