Fixed class name and removed dead code