Fix null bug from import shortcuts. Remove template until changes are complete.