remove now unneeded parameters
Merge branch 'master' of github.com:maxdeliso/twig