Upgrade Gems
Remove redundant template boilerplate