Applying some simplifications mentioned in #4204
Applying some simplifications mentioned in #4204

Shenker93/playframework,rajeshpg/playframework,Shenker93/playframework,aradchykov/playframework,benmccann/playframework,wsargent/playframework,hagl/playframework,Shruti9520/playframework,wegtam/playframework,richdougherty/playframework,Shenker93/playframework,rajeshpg/playframework,zaneli/playframework,wegtam/playframework,Shruti9520/playframework,rajeshpg/playframework,marcospereira/playframework,benmccann/playframework,aradchykov/playframework,ktoso/playframework,playframework/playframework,richdougherty/playframework,wegtam/playframework,hagl/playframework,marcospereira/playframework,mkurz/playframework,marcospereira/playframework,zaneli/playframework,Shruti9520/playframework,rajeshpg/playframework,wsargent/playframework,wegtam/playframework,Shenker93/playframework,playframework/playframework,ktoso/playframework,wsargent/playframework,mkurz/playframework,ktoso/playframework,aradchykov/playframework,aradchykov/playframework,mkurz/playframework,ktoso/playframework,richdougherty/playframework,zaneli/playframework,Shruti9520/playframework,benmccann/playframework,richdougherty/playframework,hagl/playframework,benmccann/playframework,wsargent/playframework,marcospereira/playframework,mkurz/playframework,playframework/playframework,hagl/playframework,zaneli/playframework