Remove unused code #113

#113