clean up code -- unused decl have removed