- moved into templates rest class - updated dao - removed delete methods - constraint on subject line