More artifacts removal from my starter template.