Removed debug statements and static template data