Cleaning For Spring - 1.0