v0.0.5 removed unnessesary items