using local var s
removed old decls