Removed dead code and incremented version to 0.1.8