v1.0.8-b2: Removed unnecessary code