remove unused code #121