finish cleanup for strategy pattern