Unused variable and systemouts removed