Code clean up before starting the hard work to implement 1.0.0