remove local variables which are only used in function context

remove local variables which are only used in function context #547