Change servlet listener & cleanup code