minor fixes.
minor fixes.
remove debug statement
delete unused template