Remove unneeded includes and extends
Merge pull request #54 from alphagov/remove-unneeded-includes

Remove unneeded includes and extends