Remove templating, add own stuff