Features/spring cleanup