Remove unused variable and constant