Fixed module name and removed dead code