fix a little bug
Remove unused code (there's only a tiny bit)