remove unused variable
comment fixes
enotice fix