v0.1.3.0 - remove some unnecessary code