update and cleanup
integrated springockito