remove unused code
make the user working