adding application-context
clean up