Cosmetics and removed useless springframework dependencies