Started to cleaned up for 1.0.0