Fix error made, remove unnecessary code.