clean some useless statement
updated template